From e497b84666716fd2911535782a2db5fdd2a5e9d4 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 7 Feb 2007 14:33:12 +0000 Subject: [PATCH] (frame-set-background-mode): Use `color-values' and `display-color-p', not `x-color-values' and `x-display-color-p'. --- lisp/faces.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 3bde81e5456..749754ffb08 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1617,17 +1617,17 @@ according to the `background-mode' and `display-type' frame parameters." (or default-frame-background-mode 'dark)) ((equal bg-color "unspecified-fg") ; inverted colors (if (eq default-frame-background-mode 'light) 'dark 'light)) - ((>= (apply '+ (x-color-values bg-color frame)) + ((>= (apply '+ (color-values bg-color frame)) ;; Just looking at the screen, colors whose ;; values add up to .6 of the white total ;; still look dark to me. - (* (apply '+ (x-color-values "white" frame)) .6)) + (* (apply '+ (color-values "white" frame)) .6)) 'light) (t 'dark))) (display-type (cond ((null window-system) (if (tty-display-color-p frame) 'color 'mono)) - ((x-display-color-p frame) + ((display-color-p frame) 'color) ((x-display-grayscale-p frame) 'grayscale) -- 2.30.2